Auto merge of #2034 - alexcrichton:update-toml, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 7 Oct 2015 17:46:41 +0000 (17:46 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Oct 2015 17:46:41 +0000 (17:46 +0000)
Closes #2031
Closes #2033


Trivial merge